gdkwindow: Don't pass the region to the impl when beginning a paint

It's unused. At the same time, rename "begin_paint_region" to
"begin_paint". This will help us clean up how GDK painting works
in the future to allow more creative use of double-buffering.

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 6d56a6c7e4308e02a217402a8fb0cdec42bbe3ce..9d26943e564b21466d3beeda875e06bad591da84 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2891,8 +2891,8 @@ gdk_window_begin_paint_region (GdkWindow       *window,
   impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
 
   needs_surface = TRUE;
-  if (impl_class->begin_paint_region)
-    needs_surface = impl_class->begin_paint_region (window, region);
+  if (impl_class->begin_paint)
+    needs_surface = impl_class->begin_paint (window);
 
   window->current_paint.region = cairo_region_copy (region);
   cairo_region_intersect (window->current_paint.region, window->clip_region);

diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index b8fb0f0286a485e103c9be7ee378fae9924bd9f4..efdaa1f5e3196eeca7df0a2e054b04a413349c28 100644 (file)
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -106,8 +106,7 @@ struct _GdkWindowImplClass
                                          gdouble         *x,
                                          gdouble         *y,
                                          GdkModifierType *mask);
-  gboolean    (* begin_paint_region)    (GdkWindow       *window,
-                                        const cairo_region_t *region);
+  gboolean    (* begin_paint)           (GdkWindow       *window);
   void        (* end_paint)             (GdkWindow       *window);
 
   cairo_region_t * (* get_shape)        (GdkWindow       *window);

diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 5f224638d55badff675eb95adc09aa9e59ed3cef..6431ed4f0f50c4532719ac01850d7b2b52ac489b 100644 (file)
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -665,10 +665,9 @@ gdk_mir_window_impl_get_device_state (GdkWindow       *window,
 }
 
 static gboolean
-gdk_mir_window_impl_begin_paint_region (GdkWindow            *window,
-                                        const cairo_region_t *region)
+gdk_mir_window_impl_begin_paint (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_begin_paint_region window=%p\n", window);
+  //g_printerr ("gdk_mir_window_impl_begin_paint window=%p\n", window);
   /* Indicate we are ready to be drawn onto directly? */
   return FALSE;
 }
@@ -1557,7 +1556,7 @@ gdk_mir_window_impl_class_init (GdkMirWindowImplClass *klass)
   impl_class->get_geometry = gdk_mir_window_impl_get_geometry;
   impl_class->get_root_coords = gdk_mir_window_impl_get_root_coords;
   impl_class->get_device_state = gdk_mir_window_impl_get_device_state;
-  impl_class->begin_paint_region = gdk_mir_window_impl_begin_paint_region;
+  impl_class->begin_paint = gdk_mir_window_impl_begin_paint;
   impl_class->end_paint = gdk_mir_window_impl_end_paint;
   impl_class->get_shape = gdk_mir_window_impl_get_shape;
   impl_class->get_input_shape = gdk_mir_window_impl_get_input_shape;

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 68ec2bdbbbdb9de372e4ee17c368da88f405ab75..468bc8b60fd1baf4992018e30cab9e21ddc48023 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -334,8 +334,7 @@ gdk_window_impl_quartz_init (GdkWindowImplQuartz *impl)
 }
 
 static gboolean
-gdk_window_impl_quartz_begin_paint_region (GdkWindow       *window,
-                                          const cairo_region_t *region)
+gdk_window_impl_quartz_begin_paint (GdkWindow *window)
 {
   return FALSE;
 }
@@ -2892,7 +2891,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
   impl_class->destroy_foreign = gdk_quartz_window_destroy_foreign;
   impl_class->get_shape = gdk_quartz_window_get_shape;
   impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
-  impl_class->begin_paint_region = gdk_window_impl_quartz_begin_paint_region;
+  impl_class->begin_paint = gdk_window_impl_quartz_begin_paint;
   impl_class->get_scale_factor = gdk_quartz_window_get_scale_factor;
 
   impl_class->focus = gdk_quartz_window_focus;

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index e44125ad35b9802d6a29467232156404d70264ef..dba476ca42b1a0fa7d7fef8e0745b0c808dc4cdb 100644 (file)
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -570,8 +570,7 @@ gdk_wayland_window_create_similar_image_surface (GdkWindow *     window,
 }
 
 static gboolean
-gdk_window_impl_wayland_begin_paint_region (GdkWindow            *window,
-                                            const cairo_region_t *region)
+gdk_window_impl_wayland_begin_paint (GdkWindow *window)
 {
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
   gdk_wayland_window_ensure_cairo_surface (window);
@@ -2125,7 +2124,7 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
   impl_class->destroy_foreign = gdk_window_wayland_destroy_foreign;
   impl_class->get_shape = gdk_wayland_window_get_shape;
   impl_class->get_input_shape = gdk_wayland_window_get_input_shape;
-  impl_class->begin_paint_region = gdk_window_impl_wayland_begin_paint_region;
+  impl_class->begin_paint = gdk_window_impl_wayland_begin_paint;
   impl_class->end_paint = gdk_window_impl_wayland_end_paint;
   /* impl_class->beep */